From nobody Thu Sep 19 01:22:14 2024 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=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1724331962; cv=none; d=zohomail.com; s=zohoarc; b=bzMJaEq4r527rfk1ft59f9k42ItOjPnIjhVAG3psxC5w2LKdvLVHDASj0TZIWrQPMj/wG0JyzJFKavWv7O7/f13Mh4n++zgSxZtl2Qk/uFRe1vLtEA5aDpMO1I+wN1j1VFPo/j90ka714AgUXnUlXy080elzpjUJqi2CbWuz2LY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724331962; h=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=/9vAl6gPQOHAEsxcAliRbXeAmx2pjKxpw/3blrP7pio=; b=MxxlBizM7DfdGye2L82SyA6tvdWNc47Ts8PPqivZXBJrI/ntNNkjhZURuGl02LPMEX6jv/45vDxnXO5f0lT+OuxkAPCupXGal5CbciEVZ1uVxmE1pnY6DEvhM6fWJR7BN7cJvY7GIDf7E677OB2KNfQGr47wfUvMDSx2tTcBPAI= 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 1724331961849815.8636542303888; Thu, 22 Aug 2024 06:06:01 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.781828.1191330 (Exim 4.92) (envelope-from ) id 1sh7VL-0003rg-8l; Thu, 22 Aug 2024 13:05:31 +0000 Received: by outflank-mailman (output) from mailman id 781828.1191330; Thu, 22 Aug 2024 13:05:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sh7VL-0003r7-4j; Thu, 22 Aug 2024 13:05:31 +0000 Received: by outflank-mailman (input) for mailman id 781828; Thu, 22 Aug 2024 13:05:30 +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 1sh7VK-0003o9-7B for xen-devel@lists.xenproject.org; Thu, 22 Aug 2024 13:05:30 +0000 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [2a00:1450:4864:20::535]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 34c88b1b-6087-11ef-a50a-bb4a2ccca743; Thu, 22 Aug 2024 15:05:29 +0200 (CEST) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5bed83488b6so1116995a12.2 for ; Thu, 22 Aug 2024 06:05:29 -0700 (PDT) Received: from fhilly.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c04a4c4384sm897139a12.62.2024.08.22.06.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 06:05:26 -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: 34c88b1b-6087-11ef-a50a-bb4a2ccca743 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1724331928; x=1724936728; 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=/9vAl6gPQOHAEsxcAliRbXeAmx2pjKxpw/3blrP7pio=; b=WXr3N73CrDR7WSSAu2QlbEKQLTw3K8/b5RhCs/9AF5k6azNXasM36DUirkbp0UH5wt jWgnoOx6Ry3tFGsWf+fO0/9kTXuFgXpJq6aG/rYRBA3YFguaWVlwFcpqTJd9qq8t3O3I 9FDGGcbbIgGMGAOPB+GFMR9iEIpzshrvW6SXI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724331928; x=1724936728; 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=/9vAl6gPQOHAEsxcAliRbXeAmx2pjKxpw/3blrP7pio=; b=RGTf/4juaSYorWkv3dok0BKbMcFiCO9WnJKb3TzcbNHcDL78+/Cto/eDnGnnECVLC2 pf4/Tr13EIZ+GCJNfc2MiCPepXfW5BY6AsCZaBnsOzJ5zyEIXB6OfbBYCaomXUoeUZMh QgnUq9/wiBdVbiXqvOAfDg6V64+mmadmG5VMBXESARygzzpIcNb0tU9ywwPA7/lQe/Px fzdJ9UMiWO2QsRlIs5Z4nccmi/IirMe0UgitZtFgwNjbKz60YYXeajgHj3ysIctxDIQ5 nq0M8Ac9CpxDPFU7mQsIuQ7lIxEq3aiNO0atdyMznaswg/VncXIo77yL04qhPSgVJA25 XPaw== X-Gm-Message-State: AOJu0YyGZpvIWv3FM5C5Iu7rKMuqjIXEyvmlb27Kx/N9Tc1H5xDHrivS OmVp3z4kJE+ulZytSY9CLeng35DoIm3obyEQDrK8pbjV1CxbELAbRI/a6B9U+Qdx6xD0oKdB09v p X-Google-Smtp-Source: AGHT+IGOqPZ9IUB50huyh3nkNbp/xTL91tnxC3wSx581A/j50amvanN/BPD2ZnBnSxzG0eo+7AZi9A== X-Received: by 2002:a05:6402:5215:b0:5aa:2a06:d325 with SMTP id 4fb4d7f45d1cf-5c0791d10d0mr1280006a12.7.1724331927802; Thu, 22 Aug 2024 06:05:27 -0700 (PDT) From: Fouad Hilly To: xen-devel@lists.xenproject.org Cc: Fouad Hilly , Anthony PERARD Subject: [PATCH v7 1/3] x86/ucode: refactor xen-ucode to utilize getopt Date: Thu, 22 Aug 2024 14:04:24 +0100 Message-ID: <20240822130426.492931-2-fouad.hilly@cloud.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240822130426.492931-1-fouad.hilly@cloud.com> References: <20240822130426.492931-1-fouad.hilly@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1724331963125116600 Content-Type: text/plain; charset="utf-8" Use getopt_long() to handle command line arguments. Introduce ext_err for common errors exit. Introducing usage() to handle usage\help messages in a common block. Signed-off-by: Fouad Hilly Suggested-by: Andrew Cooper --- [v7] 1- Fix Usage message format. 2- Remove generic error message from ext_err and add specific error message= s for "unknown option" and missing "microcode file". 3- Update "microcode file" -> "microcode-file" to remove ambiguity. [v6] 1- Update usage() printed message format: [microcode file] [options] -> [mi= crocode file | options] 2- Add missing blanks in switch ( opt ) [v5] 1- Update message description. 2- re-arrange static and automatic variables. 3- Fix indentations. 4- reverted the deletion of show-cpu-info for backwards compatibility. [v4] 1- Merge three patches into one. 2- usage() to print messages to the correct stream. 3- Update commit message and description. --- tools/misc/xen-ucode.c | 54 +++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index 390969db3d1c..bfc1e74dd5cc 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 static xc_interface *xch; =20 @@ -71,12 +72,30 @@ static void show_curr_cpu(FILE *f) } } =20 +static void usage(FILE *stream, const char *name) +{ + fprintf(stream, + "%s: Xen microcode updating tool\n" + "Usage: %s [options | microcode-file]\n" + "options:\n" + " -h, --help display this help\n" + " -s, --show-cpu-info show CPU information\n", + name, name); + show_curr_cpu(stream); +} + int main(int argc, char *argv[]) { + static const struct option options[] =3D { + {"help", no_argument, NULL, 'h'}, + {"show-cpu-info", no_argument, NULL, 's'}, + {NULL, no_argument, NULL, 0} + }; int fd, ret; char *filename, *buf; size_t len; struct stat st; + int opt; =20 xch =3D xc_interface_open(NULL, NULL, 0); if ( xch =3D=3D NULL ) @@ -86,22 +105,37 @@ int main(int argc, char *argv[]) exit(1); } =20 - if ( argc < 2 ) + while ( (opt =3D getopt_long(argc, argv, "hs", options, NULL)) !=3D -1= ) { - fprintf(stderr, - "xen-ucode: Xen microcode updating tool\n" - "Usage: %s [ | show-cpu-info]\n", argv[0]); - show_curr_cpu(stderr); - exit(2); + switch ( opt ) + { + case 'h': + usage(stdout, argv[0]); + exit(EXIT_SUCCESS); + + case 's': + show_curr_cpu(stdout); + exit(EXIT_SUCCESS); + + default: + fprintf(stderr, "%s: unknown option\n", argv[0]); + goto ext_err; + } } =20 - if ( !strcmp(argv[1], "show-cpu-info") ) + if ( optind =3D=3D argc ) { + fprintf(stderr, "%s: missing microcode file\n", argv[0]); + goto ext_err; + } + + /* For backwards compatibility to the pre-getopt() cmdline handling */ + if ( !strcmp(argv[optind], "show-cpu-info") ) { show_curr_cpu(stdout); return 0; } =20 - filename =3D argv[1]; + filename =3D argv[optind]; fd =3D open(filename, O_RDONLY); if ( fd < 0 ) { @@ -146,4 +180,8 @@ int main(int argc, char *argv[]) close(fd); =20 return 0; + + ext_err: + usage(stderr, argv[0]); + exit(EXIT_FAILURE); } --=20 2.42.0 From nobody Thu Sep 19 01:22:14 2024 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=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1724331956; cv=none; d=zohomail.com; s=zohoarc; b=Rlru4VVQaIjoluJGbeNzGA4wJeHpKQqCFmzbSwXOLaLQ8XZyrJoNF4Q/2zPfenv/EbsSdVpLvHi2uQdyWpwK6lMOfjKG01O6h69YyI1SPEViCamvlJMhbdvF1v1h1ewrwwTJoq01m9W9ZvHCTTyo/OJ+ojL5vM/rsJuwrwbupj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724331956; h=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=10am4fjTuo1E+hBiTlG8YBLEvflbG5lb423qbVTK18k=; b=VBRmvKOizRcNzKAlwnuxu6ll4BZQQ+WMNAS0CynMUI9ahlswcoMU3n9jtDjrNLZT2ZxUmWSFzBRNteTDELFR0EunmJOj+CA5KG0ApwexEJq/+4Ox+FrFI5ex8KugN5Eor6yFm1xDd2e7r0oBI06acLYgv6opCdWXohwBFZYqwzQ= 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 1724331956834665.1890566113807; Thu, 22 Aug 2024 06:05:56 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.781830.1191352 (Exim 4.92) (envelope-from ) id 1sh7VP-0004LR-Qf; Thu, 22 Aug 2024 13:05:35 +0000 Received: by outflank-mailman (output) from mailman id 781830.1191352; Thu, 22 Aug 2024 13:05:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sh7VP-0004Ip-JX; Thu, 22 Aug 2024 13:05:35 +0000 Received: by outflank-mailman (input) for mailman id 781830; Thu, 22 Aug 2024 13:05:33 +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 1sh7VN-0004GT-RD for xen-devel@lists.xenproject.org; Thu, 22 Aug 2024 13:05:33 +0000 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [2a00:1450:4864:20::533]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 35d1aa7a-6087-11ef-8776-851b0ebba9a2; Thu, 22 Aug 2024 15:05:31 +0200 (CEST) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5bed0a2b1e1so753792a12.3 for ; Thu, 22 Aug 2024 06:05:31 -0700 (PDT) Received: from fhilly.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c04a4c4384sm897139a12.62.2024.08.22.06.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 06:05:28 -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: 35d1aa7a-6087-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1724331930; x=1724936730; 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=10am4fjTuo1E+hBiTlG8YBLEvflbG5lb423qbVTK18k=; b=Ya/RJcgB1KtOB+74ohQyfitvTW7ktMPRFLLg56HPgq0G3bK2LOcKCnNA1Neam/6gca /2m0WL9DwrGYMFAZvbJArWlzUSFiHKsIaZXQpvdva4A85FwP4DsyLUzG7RNzIQ34BlL0 IxZ8/ugg3ZMn0vNspdao0mj6NxCJ5hSmXEpsY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724331930; x=1724936730; 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=10am4fjTuo1E+hBiTlG8YBLEvflbG5lb423qbVTK18k=; b=kv9vHYOlJ3SYa0tL0zRC9RdM/QXgjxauzaGbXUQk6F+bsTSziX3gOcuTyLB0+aPaom AxuujaLM2cmI0YMiJ/U3rw4N3d1QXo+48iwLAUt2OTxwXztqg6tqYAnX/UeERV41hFsd XIBH00FnAXR52gQyXFNICePwMw2/twQNvl5zbrwUBDS0R5Jw35LxC0W5kwXZOeuoUTAh 752NZhTnVsJwAVAq4bBVeATclASOzJV7HHlH6BT8iiBVAuPJuxhowfmN+8yAvF89NhyW q5azHcstIfKghWK+JQRbnSOxXcI7xm0TR6zl5omtMpIbyxGrOpG8Ve5rdkJnJpUbaGK/ uXnA== X-Gm-Message-State: AOJu0YxVYSA6n+T0sIpm+7vS01gDQ4Q9cdoam65APisbNElM9aHagSY8 fVGPqzKeCl3eLlXGnAhV1jDSdxVNpfP8/q18iuJmz5N1TN0u8dxynZHyMO9LiXlwjismhqwoe45 T X-Google-Smtp-Source: AGHT+IGyvi9sVdK0NyhmKt1pg4Jn0qPhsG2sBOWf1eO/gmqESSqR5LGijXmdI/nw+xLTJbz3BFcfig== X-Received: by 2002:a05:6402:5386:b0:5a3:619:949f with SMTP id 4fb4d7f45d1cf-5c0792b5be5mr1851268a12.32.1724331929216; Thu, 22 Aug 2024 06:05:29 -0700 (PDT) From: Fouad Hilly To: xen-devel@lists.xenproject.org Cc: Fouad Hilly , Anthony PERARD , Juergen Gross , Andrew Cooper Subject: [PATCH v7 2/3] x86/ucode: Introduce --force option to xen-ucode Date: Thu, 22 Aug 2024 14:04:25 +0100 Message-ID: <20240822130426.492931-3-fouad.hilly@cloud.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240822130426.492931-1-fouad.hilly@cloud.com> References: <20240822130426.492931-1-fouad.hilly@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1724331957436116600 Content-Type: text/plain; charset="utf-8" Introduce --force option to xen-ucode to force skipping microcode version c= heck, which allows the user to update x86 microcode even if both versions are the same = or downgrade. xc_microcode_update() refactored to accept flags and utilize xenpf_microcod= e_update2. Signed-off-by: Fouad Hilly Reviewed-by: Andrew Cooper Suggested-by: Andrew Cooper --- [v7] 1- Fix usage() printout message. [v6] 1- Fix usage() output for -f option to be explicitly wrapped for 80 charact= er width [v5] 1- Update commit message. 2- Re-phrase --force option description. [v4] 1- Add --force to xen-ucode options. 2- Update xc_microcode_update() to accept and handle flags. --- tools/include/xenctrl.h | 3 ++- tools/libs/ctrl/xc_misc.c | 12 +++++++----- tools/misc/xen-ucode.c | 16 +++++++++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h index 9ceca0cffc2f..2c4608c09ab0 100644 --- a/tools/include/xenctrl.h +++ b/tools/include/xenctrl.h @@ -1171,7 +1171,8 @@ typedef uint32_t xc_node_to_node_dist_t; int xc_physinfo(xc_interface *xch, xc_physinfo_t *info); int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo); -int xc_microcode_update(xc_interface *xch, const void *buf, size_t len); +int xc_microcode_update(xc_interface *xch, const void *buf, + size_t len, unsigned int flags); int xc_get_cpu_version(xc_interface *xch, struct xenpf_pcpu_version *cpu_v= er); int xc_get_ucode_revision(xc_interface *xch, struct xenpf_ucode_revision *ucode_rev); diff --git a/tools/libs/ctrl/xc_misc.c b/tools/libs/ctrl/xc_misc.c index 50282fd60dcc..6a60216bda03 100644 --- a/tools/libs/ctrl/xc_misc.c +++ b/tools/libs/ctrl/xc_misc.c @@ -203,11 +203,12 @@ int xc_physinfo(xc_interface *xch, return 0; } =20 -int xc_microcode_update(xc_interface *xch, const void *buf, size_t len) +int xc_microcode_update(xc_interface *xch, const void *buf, + size_t len, unsigned int flags) { int ret; struct xen_platform_op platform_op =3D {}; - DECLARE_HYPERCALL_BUFFER(struct xenpf_microcode_update, uc); + DECLARE_HYPERCALL_BUFFER(struct xenpf_microcode_update2, uc); =20 uc =3D xc_hypercall_buffer_alloc(xch, uc, len); if ( uc =3D=3D NULL ) @@ -215,9 +216,10 @@ int xc_microcode_update(xc_interface *xch, const void = *buf, size_t len) =20 memcpy(uc, buf, len); =20 - platform_op.cmd =3D XENPF_microcode_update; - platform_op.u.microcode.length =3D len; - set_xen_guest_handle(platform_op.u.microcode.data, uc); + platform_op.cmd =3D XENPF_microcode_update2; + platform_op.u.microcode2.length =3D len; + platform_op.u.microcode2.flags =3D flags; + set_xen_guest_handle(platform_op.u.microcode2.data, uc); =20 ret =3D do_platform_op(xch, &platform_op); =20 diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index bfc1e74dd5cc..2d2b520c0082 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -13,6 +13,8 @@ #include #include =20 +#include + static xc_interface *xch; =20 static const char intel_id[] =3D "GenuineIntel"; @@ -79,7 +81,10 @@ static void usage(FILE *stream, const char *name) "Usage: %s [options | microcode-file]\n" "options:\n" " -h, --help display this help\n" - " -s, --show-cpu-info show CPU information\n", + " -s, --show-cpu-info show CPU information\n" + " -f, --force skip certain checks when applying\= n" + " microcode; do not use unless you k= now\n" + " exactly what you are doing\n", name, name); show_curr_cpu(stream); } @@ -89,6 +94,7 @@ int main(int argc, char *argv[]) static const struct option options[] =3D { {"help", no_argument, NULL, 'h'}, {"show-cpu-info", no_argument, NULL, 's'}, + {"force", no_argument, NULL, 'f'}, {NULL, no_argument, NULL, 0} }; int fd, ret; @@ -96,6 +102,7 @@ int main(int argc, char *argv[]) size_t len; struct stat st; int opt; + uint32_t ucode_flags =3D 0; =20 xch =3D xc_interface_open(NULL, NULL, 0); if ( xch =3D=3D NULL ) @@ -105,7 +112,7 @@ int main(int argc, char *argv[]) exit(1); } =20 - while ( (opt =3D getopt_long(argc, argv, "hs", options, NULL)) !=3D -1= ) + while ( (opt =3D getopt_long(argc, argv, "hsf", options, NULL)) !=3D -= 1 ) { switch ( opt ) { @@ -117,6 +124,9 @@ int main(int argc, char *argv[]) show_curr_cpu(stdout); exit(EXIT_SUCCESS); =20 + case 'f': + ucode_flags =3D XENPF_UCODE_FORCE; + break; default: fprintf(stderr, "%s: unknown option\n", argv[0]); goto ext_err; @@ -160,7 +170,7 @@ int main(int argc, char *argv[]) } =20 errno =3D 0; - ret =3D xc_microcode_update(xch, buf, len); + ret =3D xc_microcode_update(xch, buf, len, ucode_flags); if ( ret =3D=3D -1 && errno =3D=3D EEXIST ) printf("Microcode already up to date\n"); else if ( ret ) --=20 2.42.0 From nobody Thu Sep 19 01:22:14 2024 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=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1724331958; cv=none; d=zohomail.com; s=zohoarc; b=T9czN1cVVTP30J0rmUcosHtadbr+Nef/6ffx7XDVWkJ3HSa4POMSW8CKFxyBDqwvAguJj5X5UDCiFeyUnKcrC1jCf4VxKfRVl9tcYiC4MwnAEkYluXRrBFoqPnDKweT/qGmlXDXuc8YnlmyQbNKRgSgm7deZhlWapPw9zZCftyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724331958; h=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=x4KXlaa0yrvHzAKaeTOG6f3zudF8qeAlRuDumnA2t4o=; b=RhD9GKFXdXwJy0Xa3aico0XoBOciJG6KUyMP4nqlc3W/7AvLOH95WiHzcknWaRyJka/dJ60lh3FNGDVirwcZkbL3wlAl6zqsOdt2GxNcmkbE+cUYdlLmpPza8Gllhq7YFrYo04YBC9AWi8HcWlMlzzDkQJowttDrrmMRZscqO1s= 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 1724331958423159.93549013569043; Thu, 22 Aug 2024 06:05:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.781829.1191347 (Exim 4.92) (envelope-from ) id 1sh7VP-0004Hj-HT; Thu, 22 Aug 2024 13:05:35 +0000 Received: by outflank-mailman (output) from mailman id 781829.1191347; Thu, 22 Aug 2024 13:05:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sh7VP-0004Ha-CN; Thu, 22 Aug 2024 13:05:35 +0000 Received: by outflank-mailman (input) for mailman id 781829; Thu, 22 Aug 2024 13:05:33 +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 1sh7VN-0003o9-HS for xen-devel@lists.xenproject.org; Thu, 22 Aug 2024 13:05:33 +0000 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [2a00:1450:4864:20::22e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 36b0e5ad-6087-11ef-a50a-bb4a2ccca743; Thu, 22 Aug 2024 15:05:32 +0200 (CEST) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2ef2c56da6cso6587971fa.1 for ; Thu, 22 Aug 2024 06:05:32 -0700 (PDT) Received: from fhilly.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c04a4c4384sm897139a12.62.2024.08.22.06.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 06:05:29 -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: 36b0e5ad-6087-11ef-a50a-bb4a2ccca743 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1724331931; x=1724936731; 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=x4KXlaa0yrvHzAKaeTOG6f3zudF8qeAlRuDumnA2t4o=; b=Vx/78bKKVM5vNSFhmSG3JORzC8Jfm6I7/we03QNywCe9OpJxdqTHrJwJwPB9keORFT 96tOY5cG/QNGqUMBYybsYSUxUbIdEBXI5uD795FZj1so9YlslhN1xEK5v/5wmpRlK+LA FKJXkSAQNXorvbWlXLgijRNaoPxWj8+TtlV5Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724331931; x=1724936731; 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=x4KXlaa0yrvHzAKaeTOG6f3zudF8qeAlRuDumnA2t4o=; b=wkxQOH7+1J0YMzyzDpE53HRucI+WQ7etQoImFM6KtMlIXoMMzPTCBXO5kejMvuG9ln fH4y9ALbAX2TO44JMOE4vPryRbSzds2yh27RSAUogARGpaKirYt8ILyQErlkNydIipvI szRis8q2b9ziV5LF4yZ+Sn1c1o3C3Rxn4KCrIzZYJMy5NY9WvbFS7ocreJwhosvezAi4 OHpBw9tdCCPokzGOT+Ngh1/2sHDDRwa00S3JdrKjD/PeAESoZv2MpP6lF+PZklQI3hSe xIS5kngTV4Lj262p08poAxJAvaP677aQdVUDttMSjMdQIYcfXWcxDVAaZkhJpLDo7UiB AhRA== X-Gm-Message-State: AOJu0Yx65rq54vomLU/JSZ7hnFuSDfkTjJVhgORl/oozjHdcYFaaPccA chH5TrsBfh8AvlTCEZIdtx5HJC2spOFLG+qBBfT2Uo8Zh31tpbYGMm05vdvyph8aK2w/Iy3AuIP O X-Google-Smtp-Source: AGHT+IHHIUAQDhEMToLwf1ct8/Acte31VSgERsy6FgGPYm9Lqci6iwBO396ChDQCOKwUoHkvNKuDRQ== X-Received: by 2002:a2e:84a:0:b0:2ee:7a71:6e3b with SMTP id 38308e7fff4ca-2f3f88850d8mr30051081fa.27.1724331930527; Thu, 22 Aug 2024 06:05:30 -0700 (PDT) From: Fouad Hilly To: xen-devel@lists.xenproject.org Cc: Fouad Hilly , Oleksii Kurochko , Community Manager , Andrew Cooper , Jan Beulich , Julien Grall , Stefano Stabellini , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v7 3/3] x86/ucode: Utilize ucode_force and remove opt_ucode_allow_same Date: Thu, 22 Aug 2024 14:04:26 +0100 Message-ID: <20240822130426.492931-4-fouad.hilly@cloud.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240822130426.492931-1-fouad.hilly@cloud.com> References: <20240822130426.492931-1-fouad.hilly@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1724331959344116600 Content-Type: text/plain; charset="utf-8" Pass xen-ucode flags to do low level checks on microcode version and utilize it to allow for microcode downgrade or reapply the same version of the microcode. ucode_force is required to be passed to a low level Intel and AMD for versi= on checks to be done. While adding ucode_force, opt_ucode_allow_same was removed. Remove opt_ucode_allow_same from documentation. update CHANGELOG.md for opt_ucode_allow_same removal. Signed-off-by: Fouad Hilly Suggested-by: Andrew Cooper --- [v7] 1- update commit message. 2- update CHANGELOG.md. 3- update microcode_free_patch(). [v6] 1- Removed struct microcode_nmi_patch_with_flags. 2- removed const from control_thread_fn() and primary_thread_fn(). 3- Fixed "flags" checks. [v5] 1- Update commit message. 2- Introduce structs microcode_patch_with_flags and microcode_nmi_patch_wit= h_flags. 3- pass flags to Intel and AMD low level through apply_microcode(). [4] 1- As opt_ucode_allow_same is not required anymore, it has been removed whi= le introducing ucode_force. 2- Apply the changes for both AMD and Intel. 3- Remove the mention of opt_ucode_allow_same from documentation. --- CHANGELOG.md | 1 + docs/misc/xen-command-line.pandoc | 7 +- xen/arch/x86/cpu/microcode/amd.c | 8 ++- xen/arch/x86/cpu/microcode/core.c | 95 ++++++++++++++++------------ xen/arch/x86/cpu/microcode/intel.c | 9 ++- xen/arch/x86/cpu/microcode/private.h | 5 +- 6 files changed, 72 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5521ae5bb37a..3c5fc9e9d0bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepach= angelog.com/en/1.0.0/) ### Removed - On x86: - Support for running on Xeon Phi processors. + - Remove ucode=3Dallow-same option. =20 ## [4.19.0](https://xenbits.xenproject.org/gitweb/?p=3Dxen.git;a=3Dshortlo= g;h=3DRELEASE-4.19.0) - 2024-07-29 =20 diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line= .pandoc index 0a66e1ee2d7e..959cf45b55d9 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2650,7 +2650,7 @@ performance. Alternatively, selecting `tsx=3D1` will re-enable TSX at the users own = risk. =20 ### ucode -> `=3D List of [ | scan=3D, nmi=3D, allow-same=3D ]` +> `=3D List of [ | scan=3D, nmi=3D ]` =20 Applicability: x86 Default: `nmi` @@ -2682,11 +2682,6 @@ precedence over `scan`. stop_machine context. In NMI handler, even NMIs are blocked, which is considered safer. The default value is `true`. =20 -'allow-same' alters the default acceptance policy for new microcode to per= mit -trying to reload the same version. Many CPUs will actually reload microco= de -of the same version, and this allows for easy testing of the late microcode -loading path. - ### unrestricted_guest (Intel) > `=3D ` =20 diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/= amd.c index f76a563c8b84..80ff6335d64a 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -22,6 +22,8 @@ =20 #include "private.h" =20 +#include "public/platform.h" + #define pr_debug(x...) ((void)0) =20 struct equiv_cpu_entry { @@ -214,13 +216,15 @@ static enum microcode_match_result cf_check compare_p= atch( return compare_header(new, old); } =20 -static int cf_check apply_microcode(const struct microcode_patch *patch) +static int cf_check apply_microcode(const struct microcode_patch *patch, + unsigned int flags) { int hw_err; unsigned int cpu =3D smp_processor_id(); struct cpu_signature *sig =3D &per_cpu(cpu_sig, cpu); uint32_t rev, old_rev =3D sig->rev; enum microcode_match_result result =3D microcode_fits(patch); + bool ucode_force =3D flags & XENPF_UCODE_FORCE; =20 if ( result =3D=3D MIS_UCODE ) return -EINVAL; @@ -229,7 +233,7 @@ static int cf_check apply_microcode(const struct microc= ode_patch *patch) * Allow application of the same revision to pick up SMT-specific chan= ges * even if the revision of the other SMT thread is already up-to-date. */ - if ( result =3D=3D OLD_UCODE ) + if ( !ucode_force && (result =3D=3D SAME_UCODE || result =3D=3D OLD_UC= ODE) ) return -EEXIST; =20 if ( check_final_patch_levels(sig) ) diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode= /core.c index 8a9e744489b9..7beca5c4e724 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -90,6 +90,11 @@ struct ucode_mod_blob { size_t size; }; =20 +struct patch_with_flags { + unsigned int flags; + const struct microcode_patch *patch; +}; + static struct ucode_mod_blob __initdata ucode_blob; /* * By default we will NOT parse the multiboot modules to see if there is @@ -100,10 +105,8 @@ static bool __initdata ucode_scan; /* By default, ucode loading is done in NMI handler */ static bool ucode_in_nmi =3D true; =20 -bool __read_mostly opt_ucode_allow_same; - /* Protected by microcode_mutex */ -static struct microcode_patch *microcode_cache; +static const struct microcode_patch *microcode_cache; =20 void __init microcode_set_module(unsigned int idx) { @@ -128,8 +131,6 @@ static int __init cf_check parse_ucode(const char *s) =20 if ( (val =3D parse_boolean("nmi", s, ss)) >=3D 0 ) ucode_in_nmi =3D val; - else if ( (val =3D parse_boolean("allow-same", s, ss)) >=3D 0 ) - opt_ucode_allow_same =3D val; else if ( !ucode_mod_forced ) /* Not forced by EFI */ { if ( (val =3D parse_boolean("scan", s, ss)) >=3D 0 ) @@ -237,7 +238,10 @@ static DEFINE_PER_CPU(int, loading_err); */ static cpumask_t cpu_callin_map; static atomic_t cpu_out, cpu_updated; -static const struct microcode_patch *nmi_patch =3D ZERO_BLOCK_PTR; +static struct patch_with_flags nmi_patch =3D +{ + .patch =3D ZERO_BLOCK_PTR, +}; =20 /* * Return a patch that covers current CPU. If there are multiple patches, @@ -252,13 +256,13 @@ static struct microcode_patch *parse_blob(const char = *buf, size_t len) return alternative_call(ucode_ops.cpu_request_microcode, buf, len, tru= e); } =20 -static void microcode_free_patch(struct microcode_patch *patch) +static void microcode_free_patch(const struct microcode_patch *patch) { - xfree(patch); + xfree((struct microcode_patch *)patch); } =20 /* Return true if cache gets updated. Otherwise, return false */ -static bool microcode_update_cache(struct microcode_patch *patch) +static bool microcode_update_cache(const struct microcode_patch *patch) { ASSERT(spin_is_locked(µcode_mutex)); =20 @@ -327,7 +331,8 @@ static bool cf_check wait_cpu_callout(unsigned int nr) * If no patch is provided, the cached patch will be loaded. Microcode upd= ate * during APs bringup and CPU resuming falls into this case. */ -static int microcode_update_cpu(const struct microcode_patch *patch) +static int microcode_update_cpu(const struct microcode_patch *patch, + unsigned int flags) { int err; =20 @@ -335,10 +340,11 @@ static int microcode_update_cpu(const struct microcod= e_patch *patch) =20 spin_lock(µcode_mutex); if ( patch ) - err =3D alternative_call(ucode_ops.apply_microcode, patch); + err =3D alternative_call(ucode_ops.apply_microcode, patch, flags); else if ( microcode_cache ) { - err =3D alternative_call(ucode_ops.apply_microcode, microcode_cach= e); + err =3D alternative_call(ucode_ops.apply_microcode, microcode_cach= e, + flags); if ( err =3D=3D -EIO ) { microcode_free_patch(microcode_cache); @@ -379,7 +385,8 @@ static int secondary_nmi_work(void) return wait_for_state(LOADING_EXIT) ? 0 : -EBUSY; } =20 -static int primary_thread_work(const struct microcode_patch *patch) +static int primary_thread_work(const struct microcode_patch *patch, + unsigned int flags) { int ret; =20 @@ -388,7 +395,7 @@ static int primary_thread_work(const struct microcode_p= atch *patch) if ( !wait_for_state(LOADING_ENTER) ) return -EBUSY; =20 - ret =3D alternative_call(ucode_ops.apply_microcode, patch); + ret =3D alternative_call(ucode_ops.apply_microcode, patch, flags); if ( !ret ) atomic_inc(&cpu_updated); atomic_inc(&cpu_out); @@ -416,7 +423,8 @@ static int cf_check microcode_nmi_callback( return 0; =20 if ( primary_cpu ) - ret =3D primary_thread_work(nmi_patch); + ret =3D primary_thread_work(nmi_patch.patch, + nmi_patch.flags); else ret =3D secondary_nmi_work(); this_cpu(loading_err) =3D ret; @@ -446,7 +454,8 @@ static int secondary_thread_fn(void) return this_cpu(loading_err); } =20 -static int primary_thread_fn(const struct microcode_patch *patch) +static int primary_thread_fn(const struct microcode_patch *patch, + unsigned int flags) { if ( !wait_for_state(LOADING_CALLIN) ) return -EBUSY; @@ -466,10 +475,11 @@ static int primary_thread_fn(const struct microcode_p= atch *patch) return this_cpu(loading_err); } =20 - return primary_thread_work(patch); + return primary_thread_work(patch, flags); } =20 -static int control_thread_fn(const struct microcode_patch *patch) +static int control_thread_fn(const struct microcode_patch *patch, + unsigned int flags) { unsigned int cpu =3D smp_processor_id(), done; unsigned long tick; @@ -482,7 +492,8 @@ static int control_thread_fn(const struct microcode_pat= ch *patch) */ watchdog_disable(); =20 - nmi_patch =3D patch; + nmi_patch.patch =3D patch; + nmi_patch.flags =3D flags; smp_wmb(); saved_nmi_callback =3D set_nmi_callback(microcode_nmi_callback); =20 @@ -498,7 +509,7 @@ static int control_thread_fn(const struct microcode_pat= ch *patch) goto out; =20 /* Control thread loads ucode first while others are in NMI handler. */ - ret =3D alternative_call(ucode_ops.apply_microcode, patch); + ret =3D alternative_call(ucode_ops.apply_microcode, patch, flags); if ( !ret ) atomic_inc(&cpu_updated); atomic_inc(&cpu_out); @@ -544,17 +555,19 @@ static int control_thread_fn(const struct microcode_p= atch *patch) =20 set_nmi_callback(saved_nmi_callback); smp_wmb(); - nmi_patch =3D ZERO_BLOCK_PTR; + nmi_patch.patch =3D ZERO_BLOCK_PTR; + nmi_patch.flags =3D 0; =20 watchdog_enable(); =20 return ret; } =20 -static int cf_check do_microcode_update(void *patch) +static int cf_check do_microcode_update(void *_patch_with_flags) { unsigned int cpu =3D smp_processor_id(); int ret; + struct patch_with_flags *patch_with_flags =3D _patch_with_flags; =20 /* * The control thread set state to coordinate ucode loading. Primary @@ -562,9 +575,11 @@ static int cf_check do_microcode_update(void *patch) * the completion of the ucode loading process. */ if ( cpu =3D=3D cpumask_first(&cpu_online_map) ) - ret =3D control_thread_fn(patch); + ret =3D control_thread_fn(patch_with_flags->patch, + patch_with_flags->flags); else if ( is_cpu_primary(cpu) ) - ret =3D primary_thread_fn(patch); + ret =3D primary_thread_fn(patch_with_flags->patch, + patch_with_flags->flags); else ret =3D secondary_thread_fn(); =20 @@ -582,7 +597,8 @@ static long cf_check microcode_update_helper(void *data) int ret; struct ucode_buf *buffer =3D data; unsigned int cpu, updated; - struct microcode_patch *patch; + struct patch_with_flags patch_with_flags; + bool ucode_force =3D buffer->flags & XENPF_UCODE_FORCE; =20 /* cpu_online_map must not change during update */ if ( !get_cpu_maps() ) @@ -606,16 +622,17 @@ static long cf_check microcode_update_helper(void *da= ta) goto put; } =20 - patch =3D parse_blob(buffer->buffer, buffer->len); + patch_with_flags.patch =3D parse_blob(buffer->buffer, buffer->len); + patch_with_flags.flags =3D buffer->flags; xfree(buffer); - if ( IS_ERR(patch) ) + if ( IS_ERR(patch_with_flags.patch) ) { - ret =3D PTR_ERR(patch); + ret =3D PTR_ERR(patch_with_flags.patch); printk(XENLOG_WARNING "Parsing microcode blob error %d\n", ret); goto put; } =20 - if ( !patch ) + if ( !patch_with_flags.patch ) { printk(XENLOG_WARNING "microcode: couldn't find any matching ucode= in " "the provided blob!\n"); @@ -632,17 +649,17 @@ static long cf_check microcode_update_helper(void *da= ta) { enum microcode_match_result result; =20 - result =3D alternative_call(ucode_ops.compare_patch, patch, - microcode_cache); + result =3D alternative_call(ucode_ops.compare_patch, + patch_with_flags.patch, microcode_cache); =20 if ( result !=3D NEW_UCODE && - !(opt_ucode_allow_same && result =3D=3D SAME_UCODE) ) + !(ucode_force && (result =3D=3D OLD_UCODE || result =3D=3D SA= ME_UCODE)) ) { spin_unlock(µcode_mutex); printk(XENLOG_WARNING "microcode: couldn't find any newer%s revision in the p= rovided blob!\n", - opt_ucode_allow_same ? " (or the same)" : ""); - microcode_free_patch(patch); + ucode_force? " (or a valid)" : ""); + microcode_free_patch(patch_with_flags.patch); ret =3D -EEXIST; =20 goto put; @@ -674,13 +691,13 @@ static long cf_check microcode_update_helper(void *da= ta) * this requirement can be relaxed in the future. Right now, this is * conservative and good. */ - ret =3D stop_machine_run(do_microcode_update, patch, NR_CPUS); + ret =3D stop_machine_run(do_microcode_update, &patch_with_flags, NR_CP= US); =20 updated =3D atomic_read(&cpu_updated); if ( updated > 0 ) { spin_lock(µcode_mutex); - microcode_update_cache(patch); + microcode_update_cache(patch_with_flags.patch); spin_unlock(µcode_mutex); =20 /* @@ -697,7 +714,7 @@ static long cf_check microcode_update_helper(void *data) alternative_vcall(ctxt_switch_masking, current); } else - microcode_free_patch(patch); + microcode_free_patch(patch_with_flags.patch); =20 if ( updated && updated !=3D nr_cores ) printk(XENLOG_ERR "ERROR: Updating microcode succeeded on %u cores= and failed\n" @@ -775,7 +792,7 @@ int microcode_update_one(void) if ( !ucode_ops.apply_microcode ) return -EOPNOTSUPP; =20 - return microcode_update_cpu(NULL); + return microcode_update_cpu(NULL, 0); } =20 static int __init early_update_cache(const void *data, size_t len) @@ -858,7 +875,7 @@ static int __init early_microcode_update_cpu(void) if ( !patch ) return -ENOENT; =20 - return microcode_update_cpu(patch); + return microcode_update_cpu(patch, 0); } =20 int __init early_microcode_init(unsigned long *module_map, diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcod= e/intel.c index f505aa1b7888..fc80f17d2376 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -29,6 +29,8 @@ =20 #include "private.h" =20 +#include "public/platform.h" + #define pr_debug(x...) ((void)0) =20 struct microcode_patch { @@ -284,21 +286,22 @@ static enum microcode_match_result cf_check compare_p= atch( return compare_revisions(old->rev, new->rev); } =20 -static int cf_check apply_microcode(const struct microcode_patch *patch) +static int cf_check apply_microcode(const struct microcode_patch *patch, + unsigned int flags) { uint64_t msr_content; unsigned int cpu =3D smp_processor_id(); struct cpu_signature *sig =3D &this_cpu(cpu_sig); uint32_t rev, old_rev =3D sig->rev; enum microcode_match_result result; + bool ucode_force =3D flags & XENPF_UCODE_FORCE; =20 result =3D microcode_update_match(patch); =20 if ( result =3D=3D MIS_UCODE ) return -EINVAL; =20 - if ( result =3D=3D OLD_UCODE || - (result =3D=3D SAME_UCODE && !opt_ucode_allow_same) ) + if ( !ucode_force && (result =3D=3D SAME_UCODE || result =3D=3D OLD_UC= ODE) ) return -EEXIST; =20 wbinvd(); diff --git a/xen/arch/x86/cpu/microcode/private.h b/xen/arch/x86/cpu/microc= ode/private.h index da556fe5060a..017889e1b58d 100644 --- a/xen/arch/x86/cpu/microcode/private.h +++ b/xen/arch/x86/cpu/microcode/private.h @@ -3,8 +3,6 @@ =20 #include =20 -extern bool opt_ucode_allow_same; - enum microcode_match_result { OLD_UCODE, /* signature matched, but revision id is older */ SAME_UCODE, /* signature matched, but revision id is the same */ @@ -50,7 +48,8 @@ struct microcode_ops { * Attempt to load the provided patch into the CPU. Returns an error = if * anything didn't go as expected. */ - int (*apply_microcode)(const struct microcode_patch *patch); + int (*apply_microcode)(const struct microcode_patch *patch, + unsigned int flags); =20 /* * Given two patches, are they both applicable to the current CPU, and= is --=20 2.42.0