From patchwork Fri Nov 8 14:42:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13868308 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.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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1B8A4D5C0D0 for ; Fri, 8 Nov 2024 14:43:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.832619.1247914 (Exim 4.92) (envelope-from ) id 1t9QCX-0004VQ-A0; Fri, 08 Nov 2024 14:43:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 832619.1247914; Fri, 08 Nov 2024 14:43:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9QCX-0004UL-4G; Fri, 08 Nov 2024 14:43:05 +0000 Received: by outflank-mailman (input) for mailman id 832619; Fri, 08 Nov 2024 14:43:03 +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 1t9QCV-0004Ek-5c for xen-devel@lists.xenproject.org; Fri, 08 Nov 2024 14:43:03 +0000 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [2a00:1450:4864:20::62e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id beb32690-9ddf-11ef-99a3-01e77a169b0f; Fri, 08 Nov 2024 15:42:57 +0100 (CET) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a9a0c7abaa6so257497566b.2 for ; Fri, 08 Nov 2024 06:42:57 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9ee0a1769asm242652866b.1.2024.11.08.06.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 06:42:55 -0800 (PST) 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: beb32690-9ddf-11ef-99a3-01e77a169b0f X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo2MmUiLCJoZWxvIjoibWFpbC1lajEteDYyZS5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImJlYjMyNjkwLTlkZGYtMTFlZi05OWEzLTAxZTc3YTE2OWIwZiIsInRzIjoxNzMxMDc2OTc3LjY4ODMxOCwic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731076976; x=1731681776; 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=FzOnLS8oEDSa6W+7YLbE30LQXdw68icgkxCi29QgKBU=; b=dZYwQHfZ4OFiZE8ubGjLp6Lnbmv7vPDKzKYMlreL9qBWEmCsHZhDQr7OR0d/t2C6Bj USyy6jblzzLOwH/4qNeTSnbpyCNj8UM7JlYjtQRmsu2ZYMiYN9MyePGbDTUTtxid5hMy 9Uu7KxyRl9GnHKLVEIL3fJHBboMnW7QdjdKbU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731076976; x=1731681776; 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=FzOnLS8oEDSa6W+7YLbE30LQXdw68icgkxCi29QgKBU=; b=CmDepuanYpAU7Yg6RJL5FwVlJImvtdHJK6KCzY9ZJSloHIdezpRTACqw3eWr/YZf5i H+qUQYp7KpPEtHJ/4KMjVUegpexip+6FS+t03ouxmauGqju+O66Q7FAde5yi15JxN4IO A0KgtJwbDesIfSt9WgcQVYbPHZEoFy/6y1jpCD488w9sa1ac3xqTJQoqoJrnUjzETDKD 0lWivEkkYEsSkySegM4PamfR8dLlP5sv2nHu0/Ud6DIy0EXc4t13lD3/2MWHHUTk5xct kEuJnoB45kCt3KUEF/LD1HYUBwkx/jTxTS7hw76u2h8CWKYEvoKhMZjYPX+XzuG7U4Ud fPGA== X-Gm-Message-State: AOJu0YxiBHO0PnAShJk7dy1D5zJOKEeqNUL1MzE5+wxl2N1aCiWYVLs9 bYrKbr0fTnBEpW8M4odRK5Lr//nePljXP9D+C8hRWT9ubbFThBRhdxVbXU7jTuJOqsiS0Xcd0On q X-Google-Smtp-Source: AGHT+IEQ6sbZoLMaTddFbkrfA1iRfdl7IHL/JmblKm5yn3lEQSqpnR+YO+84Ndq0KeFDNh/gVny08w== X-Received: by 2002:a17:907:1c98:b0:a99:543e:94b4 with SMTP id a640c23a62f3a-a9ef001909amr264353766b.56.1731076976421; Fri, 08 Nov 2024 06:42:56 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 1/3] x86/ucode: Rework Intel's microcode_update_match() Date: Fri, 8 Nov 2024 14:42:50 +0000 Message-Id: <20241108144252.315604-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241108144252.315604-1-andrew.cooper3@citrix.com> References: <20241108144252.315604-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 This function is overloaded, creating complexity; 3 of 4 callers already only want it for it's "applicable to this CPU or not" answer, and handle revision calculations separately. Change it to be microcode_fits_cpu(), returning a simple boolean. Notably, this removes a path where cpu_request_microcode() inspects currently-loaded microcode revision, just to discard the answer. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné --- xen/arch/x86/cpu/microcode/intel.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index aad6a693e800..3f37792ab4b5 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -248,9 +248,8 @@ static enum microcode_match_result compare_revisions( return OLD_UCODE; } -/* Check an update against the CPU signature and current update revision */ -static enum microcode_match_result microcode_update_match( - const struct microcode_patch *mc) +/* Check whether this microcode patch is applicable for the current CPU. */ +static bool microcode_fits_cpu(const struct microcode_patch *mc) { const struct extended_sigtable *ext; unsigned int i; @@ -260,18 +259,15 @@ static enum microcode_match_result microcode_update_match( /* Check the main microcode signature. */ if ( signature_matches(cpu_sig, mc->sig, mc->pf) ) - goto found; + return true; /* If there is an extended signature table, check each of them. */ if ( (ext = get_ext_sigtable(mc)) != NULL ) for ( i = 0; i < ext->count; ++i ) if ( signature_matches(cpu_sig, ext->sigs[i].sig, ext->sigs[i].pf) ) - goto found; - - return MIS_UCODE; + return true; - found: - return compare_revisions(cpu_sig->rev, mc->rev); + return false; } static enum microcode_match_result cf_check compare_patch( @@ -281,8 +277,8 @@ static enum microcode_match_result cf_check compare_patch( * Both patches to compare are supposed to be applicable to local CPU. * Just compare the revision number. */ - ASSERT(microcode_update_match(old) != MIS_UCODE); - ASSERT(microcode_update_match(new) != MIS_UCODE); + ASSERT(microcode_fits_cpu(old)); + ASSERT(microcode_fits_cpu(new)); return compare_revisions(old->rev, new->rev); } @@ -297,11 +293,11 @@ static int cf_check apply_microcode(const struct microcode_patch *patch, enum microcode_match_result result; bool ucode_force = flags & XENPF_UCODE_FORCE; - result = microcode_update_match(patch); - - if ( result == MIS_UCODE ) + if ( !microcode_fits_cpu(patch) ) return -EINVAL; + result = compare_revisions(old_rev, patch->rev); + if ( !ucode_force && (result == SAME_UCODE || result == OLD_UCODE) ) return -EEXIST; @@ -365,7 +361,7 @@ static struct microcode_patch *cf_check cpu_request_microcode( * If the new update covers current CPU, compare updates and store the * one with higher revision. */ - if ( (microcode_update_match(mc) != MIS_UCODE) && + if ( microcode_fits_cpu(mc) && (!saved || compare_revisions(saved->rev, mc->rev) == NEW_UCODE) ) saved = mc; From patchwork Fri Nov 8 14:42:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13868310 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.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 smtp.lore.kernel.org (Postfix) with ESMTPS id 09015D5C0D1 for ; Fri, 8 Nov 2024 14:43:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.832618.1247908 (Exim 4.92) (envelope-from ) id 1t9QCX-0004TT-1j; Fri, 08 Nov 2024 14:43:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 832618.1247908; Fri, 08 Nov 2024 14:43:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9QCW-0004TM-Un; Fri, 08 Nov 2024 14:43:04 +0000 Received: by outflank-mailman (input) for mailman id 832618; Fri, 08 Nov 2024 14:43:03 +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 1t9QCU-0004Ee-VT for xen-devel@lists.xenproject.org; Fri, 08 Nov 2024 14:43:02 +0000 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [2a00:1450:4864:20::534]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bfafcbe4-9ddf-11ef-a0c6-8be0dac302b0; Fri, 08 Nov 2024 15:42:59 +0100 (CET) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5c9c28c1ecbso2798355a12.0 for ; Fri, 08 Nov 2024 06:42:59 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9ee0a1769asm242652866b.1.2024.11.08.06.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 06:42:56 -0800 (PST) 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: bfafcbe4-9ddf-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo1MzQiLCJoZWxvIjoibWFpbC1lZDEteDUzNC5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImJmYWZjYmU0LTlkZGYtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxMDc2OTc5LjM1ODY2OCwic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731076978; x=1731681778; 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=Rvx6e7hDDh9yfZyKvdLwUiSvDhDIqKekI/oIecuoc9s=; b=l205x1p77vc/Cxpr+wZpBJLew2Hk2dTK2fwRinlrn+PcXuQ8fwT378DAH0YQEcn2Mo J5MkqZBfk2f4ApOWtYIBJ9wQKcmSqO3cuFjookg+5590Q0KtTQsDR88QYYfZlbGFGV+n dFd5Zmv8ENwLAGZ72L3KW2yVBlMKuMkxWseL0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731076978; x=1731681778; 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=Rvx6e7hDDh9yfZyKvdLwUiSvDhDIqKekI/oIecuoc9s=; b=FdGDcoqVttsOsZjKmDSiXscswDd4uj+9tPbXCiXqDRUNi181mHEbus82NtNNKZLSS4 7SsmQ9yqtY+gIgqY5e0T5Z/yqL29Etoeb8/Xmk/yqE39UnkhOBqCiPO2yCJ8LJzRqivJ 5HTOqS0OaPOL4GNhNGpDRkGXHVoD9YLF3fzKsdJyzDB+iz6wjKiIqXNF6/KSp0LDkMve 6v0he7HNoSDw14LSZ4vqKVc6e5Ll9v8nz5uF1Ca1D9r9N4HzrPMj+evPKr2WG/kvq2tt mWqEl1oKMvQTHhAb8zPq04DhJu/zA7xiSGjZbake+Wc9z/nnjoqxFqgSglDfPdTthRQB oUew== X-Gm-Message-State: AOJu0YxfNJGr5XHSknFQis4rfNsh2abwSpTdPx9REp6YdsfeLmXlPk77 ioyDw9wteySV7xUso1xl7uKocE3eGtkanXQZrd7jcHt1Ca+OrZCl4bUL1Qg/Tk1sC9GopitZHli v X-Google-Smtp-Source: AGHT+IHh0V7LDjgbTI/cZZA70SUOsc2LiajlysWqvUWIbghIxkfUHTGMhcMvw2D8NLjByq4xxdb2IA== X-Received: by 2002:a17:907:7f1f:b0:a99:f4be:7a6a with SMTP id a640c23a62f3a-a9eeffdc630mr299757066b.47.1731076977862; Fri, 08 Nov 2024 06:42:57 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 2/3] x86/ucode: Rework AMD's microcode_fits() Date: Fri, 8 Nov 2024 14:42:51 +0000 Message-Id: <20241108144252.315604-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241108144252.315604-1-andrew.cooper3@citrix.com> References: <20241108144252.315604-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 This function is overloaded, creating complexity; 3 of 4 callers already only want it for it's "applicable to this CPU or not" answer, and handle revision calculations separately. Change it to be microcode_fits_cpu(), returning a simple boolean. The checking of the equiv table can be simplified substantially too; A mapping will only be inserted if it's correct for the CPU, so any nonzero equiv.sig suffices to know that equiv.id is correct. Drop compare_header() too, which is simiarly overloaded, and use compare_revisions() directly. Notably, this removes a path where cpu_request_microcode() inspects currently-loaded microcode revision, just to discard the answer. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné --- xen/arch/x86/cpu/microcode/amd.c | 49 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index c7a779c1d885..3861fec6565a 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -182,36 +182,31 @@ static enum microcode_match_result compare_revisions( return OLD_UCODE; } -static enum microcode_match_result microcode_fits( - const struct microcode_patch *patch) -{ - unsigned int cpu = smp_processor_id(); - const struct cpu_signature *sig = &per_cpu(cpu_sig, cpu); - - if ( equiv.sig != sig->sig || - equiv.id != patch->processor_rev_id ) - return MIS_UCODE; - - return compare_revisions(sig->rev, patch->patch_id); -} - -static enum microcode_match_result compare_header( - const struct microcode_patch *new, const struct microcode_patch *old) +/* + * Check whether this microcode patch is applicable for the current CPU. + * + * AMD microcode blobs only have the "equivalent CPU identifier" which is a 16 + * bit contraction of the 32 bit Family/Model/Stepping. + * + * We expect to only be run after scan_equiv_cpu_table() has found a valid + * mapping for the current CPU. If this is violated, the 0 in equiv.id will + * cause the patch to be rejected too. + */ +static bool microcode_fits_cpu(const struct microcode_patch *patch) { - if ( new->processor_rev_id != old->processor_rev_id ) - return MIS_UCODE; + ASSERT(equiv.sig); - return compare_revisions(old->patch_id, new->patch_id); + return equiv.id == patch->processor_rev_id; } static enum microcode_match_result cf_check compare_patch( const struct microcode_patch *new, const struct microcode_patch *old) { /* Both patches to compare are supposed to be applicable to local CPU. */ - ASSERT(microcode_fits(new) != MIS_UCODE); - ASSERT(microcode_fits(old) != MIS_UCODE); + ASSERT(microcode_fits_cpu(new)); + ASSERT(microcode_fits_cpu(old)); - return compare_header(new, old); + return compare_revisions(old->patch_id, new->patch_id); } static int cf_check apply_microcode(const struct microcode_patch *patch, @@ -221,12 +216,14 @@ static int cf_check apply_microcode(const struct microcode_patch *patch, unsigned int cpu = smp_processor_id(); struct cpu_signature *sig = &per_cpu(cpu_sig, cpu); uint32_t rev, old_rev = sig->rev; - enum microcode_match_result result = microcode_fits(patch); + enum microcode_match_result result; bool ucode_force = flags & XENPF_UCODE_FORCE; - if ( result == MIS_UCODE ) + if ( !microcode_fits_cpu(patch) ) return -EINVAL; + result = compare_revisions(old_rev, patch->patch_id); + /* * Allow application of the same revision to pick up SMT-specific changes * even if the revision of the other SMT thread is already up-to-date. @@ -396,8 +393,10 @@ static struct microcode_patch *cf_check cpu_request_microcode( * If the new ucode covers current CPU, compare ucodes and store the * one with higher revision. */ - if ( (microcode_fits(mc->patch) != MIS_UCODE) && - (!saved || (compare_header(mc->patch, saved) == NEW_UCODE)) ) + if ( microcode_fits_cpu(mc->patch) && + (!saved || + compare_revisions(saved->patch_id, + mc->patch->patch_id) == NEW_UCODE) ) { saved = mc->patch; saved_size = mc->len; From patchwork Fri Nov 8 14:42:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13868311 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.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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4044FD5C0D0 for ; Fri, 8 Nov 2024 14:43:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.832620.1247919 (Exim 4.92) (envelope-from ) id 1t9QCX-0004bK-Ii; Fri, 08 Nov 2024 14:43:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 832620.1247919; Fri, 08 Nov 2024 14:43:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t9QCX-0004a3-DJ; Fri, 08 Nov 2024 14:43:05 +0000 Received: by outflank-mailman (input) for mailman id 832620; Fri, 08 Nov 2024 14:43:04 +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 1t9QCV-0004Ee-Vn for xen-devel@lists.xenproject.org; Fri, 08 Nov 2024 14:43:03 +0000 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [2a00:1450:4864:20::136]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c007c9dc-9ddf-11ef-a0c6-8be0dac302b0; Fri, 08 Nov 2024 15:42:59 +0100 (CET) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-539fb49c64aso3405888e87.0 for ; Fri, 08 Nov 2024 06:42:59 -0800 (PST) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9ee0a1769asm242652866b.1.2024.11.08.06.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2024 06:42:58 -0800 (PST) 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: c007c9dc-9ddf-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjoxMzYiLCJoZWxvIjoibWFpbC1sZjEteDEzNi5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImMwMDdjOWRjLTlkZGYtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxMDc2OTc5Ljc1MDI0Niwic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1731076979; x=1731681779; 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=eAYyhUk3NiNBRpvH7yor3qXtJxAbrlhbvjZAvpbioVA=; b=KJeSDo5Y5/WyGjExdFR8TK/i5F1QnzOQ30Ma6/Jc3ZKxzbZhBlHAviIUkAk9pGOJwr uUpOa7vtO4jk64wWN1j5bW+LKBN+odENUQIKlrqIncvCZFOOdVZ0OylVrMaZo42ljuax XVT8v3qvyf9VNHsT6pGUXl41FpQxEMBEyBjRE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731076979; x=1731681779; 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=eAYyhUk3NiNBRpvH7yor3qXtJxAbrlhbvjZAvpbioVA=; b=MJtMHVXgDHVX6RqT5p0ip55q86063DrKmJBOdCfYIJ5IhlE9d+t2ovlAJ9xESpdP+Z ciM7gKNd+R642LW0UTul2VTxw3s1iGQkIyMxZqWjywmHDzaTBQml+JyG7faI1YaavdFD gmkps2/gDPXxgycrnvu7qu5ZGw74JPOHVrH0qHWUdUX5TalvGibV8ITnUpW9UIx70TJn jrccd+pMS84auaX2d5WuwCpkdl7GUqJ06+bPMCKvEHiGP+I0i8B9A3gYX6PZTKMdA/EN 5kf8mDDFFY8uN5a7Vb3Fj458mM9jeY6GeW6c/4OdIjG0hMt8KiGR50aOaoCIlbRu52ol vitw== X-Gm-Message-State: AOJu0Yy+73gvmkBl9AG8LD94T2ogGs1irbSqQtoSUAYn/umlODu7VTA4 MaD8GGnxVlh0dfSQoia/lR4UFSL1TkTqzH6GUTuLtDTES2cYOVqDSYGFnE89/pDUOWbC7cr9TwK C X-Google-Smtp-Source: AGHT+IGnPqf8jybKj6TO83BLp1vxdYvmZx+c0I1+Ak4JN/eWFn0gbiR4NvaiWXKrze/JnFqBp02Irg== X-Received: by 2002:a05:6512:2348:b0:53b:1fd1:df34 with SMTP id 2adb3069b0e04-53d862ee36bmr2606893e87.45.1731076978612; Fri, 08 Nov 2024 06:42:58 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH 3/3] x86/ucode: Drop MIS_UCODE and microcode_match_result Date: Fri, 8 Nov 2024 14:42:52 +0000 Message-Id: <20241108144252.315604-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241108144252.315604-1-andrew.cooper3@citrix.com> References: <20241108144252.315604-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 All uses of MIS_UCODE, have been removed, leaving only a simple ordering relation, and microcode_match_result being a stale name. Drop the enum entirely, and use a simple int -1/0/1 scheme like other standard ordering primitives in C. Swap the order or parameters to compare_patch(), to reduce cognitive complexity; all other logic operates the other way around. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monné I don't particular like keeping "result" as a variable name, but nothing better comes to mind. --- xen/arch/x86/cpu/microcode/amd.c | 10 ++++------ xen/arch/x86/cpu/microcode/core.c | 5 ++--- xen/arch/x86/cpu/microcode/intel.c | 9 ++++----- xen/arch/x86/cpu/microcode/private.h | 21 ++++++++++----------- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 3861fec6565a..366c8c59e93a 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -170,8 +170,7 @@ static bool check_final_patch_levels(const struct cpu_signature *sig) return false; } -static enum microcode_match_result compare_revisions( - uint32_t old_rev, uint32_t new_rev) +static int compare_revisions(uint32_t old_rev, uint32_t new_rev) { if ( new_rev > old_rev ) return NEW_UCODE; @@ -199,8 +198,8 @@ static bool microcode_fits_cpu(const struct microcode_patch *patch) return equiv.id == patch->processor_rev_id; } -static enum microcode_match_result cf_check compare_patch( - const struct microcode_patch *new, const struct microcode_patch *old) +static int cf_check compare_patch( + const struct microcode_patch *old, const struct microcode_patch *new) { /* Both patches to compare are supposed to be applicable to local CPU. */ ASSERT(microcode_fits_cpu(new)); @@ -212,11 +211,10 @@ static enum microcode_match_result cf_check compare_patch( static int cf_check apply_microcode(const struct microcode_patch *patch, unsigned int flags) { - int hw_err; + int hw_err, result; unsigned int cpu = smp_processor_id(); struct cpu_signature *sig = &per_cpu(cpu_sig, cpu); uint32_t rev, old_rev = sig->rev; - enum microcode_match_result result; bool ucode_force = flags & XENPF_UCODE_FORCE; if ( !microcode_fits_cpu(patch) ) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index 0cc5daa251e2..05d0d68d8158 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -470,8 +470,7 @@ struct ucode_buf { static long cf_check microcode_update_helper(void *data) { struct microcode_patch *patch = NULL; - enum microcode_match_result result; - int ret; + int ret, result; struct ucode_buf *buffer = data; unsigned int cpu, updated; struct patch_with_flags patch_with_flags; @@ -527,7 +526,7 @@ static long cf_check microcode_update_helper(void *data) spin_lock(µcode_mutex); if ( microcode_cache ) { - result = alternative_call(ucode_ops.compare_patch, patch, microcode_cache); + result = alternative_call(ucode_ops.compare_patch, microcode_cache, patch); if ( result != NEW_UCODE && !(ucode_force && (result == OLD_UCODE || result == SAME_UCODE)) ) diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index 3f37792ab4b5..9616a5e9db4b 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -229,8 +229,7 @@ static int microcode_sanity_check(const struct microcode_patch *patch) * Production microcode has a positive revision. Pre-production microcode has * a negative revision. */ -static enum microcode_match_result compare_revisions( - int32_t old_rev, int32_t new_rev) +static int compare_revisions(int32_t old_rev, int32_t new_rev) { if ( new_rev > old_rev ) return NEW_UCODE; @@ -270,8 +269,8 @@ static bool microcode_fits_cpu(const struct microcode_patch *mc) return false; } -static enum microcode_match_result cf_check compare_patch( - const struct microcode_patch *new, const struct microcode_patch *old) +static int cf_check compare_patch( + const struct microcode_patch *old, const struct microcode_patch *new) { /* * Both patches to compare are supposed to be applicable to local CPU. @@ -290,7 +289,7 @@ static int cf_check apply_microcode(const struct microcode_patch *patch, unsigned int cpu = smp_processor_id(); struct cpu_signature *sig = &this_cpu(cpu_sig); uint32_t rev, old_rev = sig->rev; - enum microcode_match_result result; + int result; bool ucode_force = flags & XENPF_UCODE_FORCE; if ( !microcode_fits_cpu(patch) ) diff --git a/xen/arch/x86/cpu/microcode/private.h b/xen/arch/x86/cpu/microcode/private.h index c9dd8ba066f9..957d4d4293d0 100644 --- a/xen/arch/x86/cpu/microcode/private.h +++ b/xen/arch/x86/cpu/microcode/private.h @@ -5,13 +5,6 @@ #include -enum microcode_match_result { - OLD_UCODE, /* signature matched, but revision id is older */ - SAME_UCODE, /* signature matched, but revision id is the same */ - NEW_UCODE, /* signature matched, but revision id is newer */ - MIS_UCODE, /* signature mismatched */ -}; - /* Opaque. Internals are vendor-specific. */ struct microcode_patch; @@ -54,11 +47,17 @@ struct microcode_ops { unsigned int flags); /* - * Given two patches, are they both applicable to the current CPU, and is - * new a higher revision than old? + * Given a current patch, and a proposed new patch, order them based on revision. + * + * This operation is not necessarily symmetrical. In some cases, a debug + * "new" patch will always considered to be newer, on the expectation that + * whomever is using debug patches knows exactly what they're doing. */ - enum microcode_match_result (*compare_patch)( - const struct microcode_patch *new, const struct microcode_patch *old); +#define OLD_UCODE -1 +#define SAME_UCODE 0 +#define NEW_UCODE 1 + int (*compare_patch)(const struct microcode_patch *old, + const struct microcode_patch *new); /* * For Linux inird microcode compatibliity.