From patchwork Thu Jul 25 08:27:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fouad Hilly X-Patchwork-Id: 13741636 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 7673CC3DA49 for ; Thu, 25 Jul 2024 08:28:05 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.764817.1175383 (Exim 4.92) (envelope-from ) id 1sWtpL-000797-6E; Thu, 25 Jul 2024 08:27:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 764817.1175383; Thu, 25 Jul 2024 08:27:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sWtpL-000790-1u; Thu, 25 Jul 2024 08:27:55 +0000 Received: by outflank-mailman (input) for mailman id 764817; Thu, 25 Jul 2024 08:27:54 +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 1sWtpK-0006fy-1S for xen-devel@lists.xenproject.org; Thu, 25 Jul 2024 08:27:54 +0000 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [2a00:1450:4864:20::52b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c91f2d10-4a5f-11ef-bbff-fd08da9f4363; Thu, 25 Jul 2024 10:27:52 +0200 (CEST) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-58f9874aeb4so705754a12.0 for ; Thu, 25 Jul 2024 01:27:52 -0700 (PDT) Received: from fhilly.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63590e7esm558590a12.36.2024.07.25.01.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 01:27:51 -0700 (PDT) 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: c91f2d10-4a5f-11ef-bbff-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1721896072; x=1722500872; 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=BMAwTFy1Rlxptzf1ewiWhywNFS6V1PSKUkf1KHF6qIo=; b=Is5JZWrhnOBXK54KYo9gKIe9Zx3/9zcObnIgEsbKKAfI8VCcTjCubpc6uL3Tmf1RWG eBCjUxIvMrohf7dw+L5giWkVtgKXXGLAWYBLMYB7ItEwR3WXMqRGWxukryfNV9X2XK0c Kh9PUghh9Na5Oxcn157FMXvB7E/iuU8SdgW50= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721896072; x=1722500872; 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=BMAwTFy1Rlxptzf1ewiWhywNFS6V1PSKUkf1KHF6qIo=; b=wWL7BaWv1eLLFu6WfPlCok1B28YdA05V7s7SGLxNU0h3Vvpqa1g5ARBIXw3H5vPxYc LVw4GTYPGfR6ZmH9pPuW7xRABwq94PxLWxYtXOFlf4cvGEM91rCfXG2qneQUtRsJb8po iHREIlNmLfsAQ48OmI5Xj3PQabPfsM8m7s9c0R07pCvHREdAm4HGoXn98LuXleNCxcNJ sY4D2ie4dtGyMYwpG1OeyVcWL+OtgsYMLlV7gJpaZA8nSydlgfP2EgI3qx8Ey+wuDoga t2bPQUvlJzNYlkmmrJwpmfiDWCUitmfjVNUN8qDDlKNsGr26Zo5kQ3mJZQWPSx+yQHeO doEg== X-Gm-Message-State: AOJu0YyeBdoCU3Qcziv5AQvw85Wn26tg2QbPYq8cLxcLheYDm1Lt1KBz NBC0vOrXhNBqksw8SbsI56Y46y+E35aK4SuEWyljKwvr7KbW/yi23tf1M/xcViz2mQmf6L108o8 w X-Google-Smtp-Source: AGHT+IEz/+qJhdhxjZMktp80vLu3Z7zdYAu8mcS1B1o0Mx+HJTsGQGdTSZqLNFRA01NszMnXySo2Kw== X-Received: by 2002:a50:9f6a:0:b0:5a1:b0b2:798d with SMTP id 4fb4d7f45d1cf-5ac64cc7549mr999063a12.25.1721896071983; Thu, 25 Jul 2024 01:27:51 -0700 (PDT) From: Fouad Hilly To: xen-devel@lists.xenproject.org Cc: Fouad Hilly , Anthony PERARD , Juergen Gross , Andrew Cooper Subject: [PATCH v6 3/4] x86/ucode: Introduce --force option to xen-ucode Date: Thu, 25 Jul 2024 09:27:24 +0100 Message-ID: <20240725082725.2685481-4-fouad.hilly@cloud.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240725082725.2685481-1-fouad.hilly@cloud.com> References: <20240725082725.2685481-1-fouad.hilly@cloud.com> MIME-Version: 1.0 Introduce --force option to xen-ucode to force skipping microcode version check, 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_microcode_update2. Signed-off-by: Fouad Hilly Reviewed-by: Andrew Cooper --- [v6] 1- Fix usage() output for -f option to be explicitly wrapped for 80 character 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 | 15 ++++++++++++--- 3 files changed, 21 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_ver); 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; } -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 = {}; - DECLARE_HYPERCALL_BUFFER(struct xenpf_microcode_update, uc); + DECLARE_HYPERCALL_BUFFER(struct xenpf_microcode_update2, uc); uc = xc_hypercall_buffer_alloc(xch, uc, len); if ( uc == NULL ) @@ -215,9 +216,10 @@ int xc_microcode_update(xc_interface *xch, const void *buf, size_t len) memcpy(uc, buf, len); - platform_op.cmd = XENPF_microcode_update; - platform_op.u.microcode.length = len; - set_xen_guest_handle(platform_op.u.microcode.data, uc); + platform_op.cmd = XENPF_microcode_update2; + platform_op.u.microcode2.length = len; + platform_op.u.microcode2.flags = flags; + set_xen_guest_handle(platform_op.u.microcode2.data, uc); ret = do_platform_op(xch, &platform_op); diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c index 2c9f337b86cb..688e540943b1 100644 --- a/tools/misc/xen-ucode.c +++ b/tools/misc/xen-ucode.c @@ -13,6 +13,8 @@ #include #include +#include + static xc_interface *xch; static const char intel_id[] = "GenuineIntel"; @@ -79,7 +81,9 @@ static void usage(FILE *stream, const char *name) "options:\n" " -h, --help display this help\n" " -s, --show-cpu-info show CPU information\n" - "Usage: %s [microcode file | options]\n", name, name); + " -f, --force skip certain checks; do not use unless\n" + "you know exactly what you are doing\n" + "Usage: %s [microcode file [-f,--force] | options]\n", name, name); show_curr_cpu(stream); } @@ -88,6 +92,7 @@ int main(int argc, char *argv[]) static const struct option options[] = { {"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; @@ -95,6 +100,7 @@ int main(int argc, char *argv[]) size_t len; struct stat st; int opt; + uint32_t ucode_flags = 0; xch = xc_interface_open(NULL, NULL, 0); if ( xch == NULL ) @@ -104,7 +110,7 @@ int main(int argc, char *argv[]) exit(1); } - while ( (opt = getopt_long(argc, argv, "hs", options, NULL)) != -1 ) + while ( (opt = getopt_long(argc, argv, "hsf", options, NULL)) != -1 ) { switch ( opt ) { @@ -116,6 +122,9 @@ int main(int argc, char *argv[]) show_curr_cpu(stdout); exit(EXIT_SUCCESS); + case 'f': + ucode_flags = XENPF_UCODE_FORCE; + break; default: goto ext_err; } @@ -156,7 +165,7 @@ int main(int argc, char *argv[]) } errno = 0; - ret = xc_microcode_update(xch, buf, len); + ret = xc_microcode_update(xch, buf, len, ucode_flags); if ( ret == -1 && errno == EEXIST ) printf("Microcode already up to date\n"); else if ( ret )