From: Chao Gao <chao.gao@intel.com> To: xen-devel@lists.xenproject.org Cc: Sergey Dyasli <sergey.dyasli@citrix.com>, Ashok Raj <ashok.raj@intel.com>, Wei Liu <wl@xen.org>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Ian Jackson <ian.jackson@eu.citrix.com>, Chao Gao <chao.gao@intel.com> Subject: [PATCH v7 01/10] misc/xen-ucode: Upload a microcode blob to the hypervisor Date: Mon, 27 May 2019 16:31:22 +0800 [thread overview] Message-ID: <1558945891-3015-2-git-send-email-chao.gao@intel.com> (raw) In-Reply-To: <1558945891-3015-1-git-send-email-chao.gao@intel.com> This patch provides a tool for late microcode update. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Chao Gao <chao.gao@intel.com> --- Changes in v7: - introduce xc_microcode_update() rather than xc_platform_op() - avoid creating bounce buffer twice - rename xenmicrocode to xen-ucode, following naming tradition of other tools there. --- tools/libxc/include/xenctrl.h | 1 + tools/libxc/xc_misc.c | 23 +++++++++++++ tools/misc/Makefile | 4 +++ tools/misc/xen-ucode.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 tools/misc/xen-ucode.c diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 538007a..6d80ae5 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1244,6 +1244,7 @@ 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_numainfo(xc_interface *xch, unsigned *max_nodes, xc_meminfo_t *meminfo, uint32_t *distance); int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 5e6714a..85538e0 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -226,6 +226,29 @@ int xc_physinfo(xc_interface *xch, return 0; } +int xc_microcode_update(xc_interface *xch, const void *buf, size_t len) +{ + int ret; + DECLARE_PLATFORM_OP; + DECLARE_HYPERCALL_BUFFER(struct xenpf_microcode_update, uc); + + uc = xc_hypercall_buffer_alloc(xch, uc, len); + if (uc == NULL) + return -1; + + 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); + + ret = do_platform_op(xch, &platform_op); + + xc_hypercall_buffer_free(xch, uc); + + return ret; +} + int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo) { diff --git a/tools/misc/Makefile b/tools/misc/Makefile index d4320dc..63947bf 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,6 +22,7 @@ INSTALL_SBIN-$(CONFIG_X86) += xen-hvmcrash INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump +INSTALL_SBIN-$(CONFIG_X86) += xen-ucode INSTALL_SBIN += xencov INSTALL_SBIN += xenlockprof INSTALL_SBIN += xenperf @@ -113,4 +114,7 @@ xen-lowmemd: xen-lowmemd.o xencov: xencov.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xen-ucode: xen-ucode.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + -include $(DEPS_INCLUDE) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c new file mode 100644 index 0000000..da668ca --- /dev/null +++ b/tools/misc/xen-ucode.c @@ -0,0 +1,78 @@ +#define _GNU_SOURCE + +#include <stdio.h> +#include <stdlib.h> +#include <sys/mman.h> +#include <errno.h> +#include <string.h> +#include <inttypes.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <xenctrl.h> + +void show_help(void) +{ + fprintf(stderr, + "xenmicrocode: Xen microcode updating tool\n" + "Usage: xenmicrocode <microcode blob>\n"); +} + +int main(int argc, char *argv[]) +{ + int fd, len, ret; + char *filename, *buf; + struct stat st; + xc_interface *xch; + + if (argc < 2) + { + show_help(); + return 0; + } + + filename = argv[1]; + fd = open(filename, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "Could not open %s. (err: %s)\n", + filename, strerror(errno)); + return errno; + } + + if (stat(filename, &st) != 0) { + fprintf(stderr, "Could not get the size of %s. (err: %s)\n", + filename, strerror(errno)); + return errno; + } + + len = st.st_size; + buf = mmap(0, len, PROT_READ, MAP_PRIVATE, fd, 0); + if (buf == MAP_FAILED) { + fprintf(stderr, "mmap failed. (error: %s)\n", strerror(errno)); + return errno; + } + + xch = xc_interface_open(0,0,0); + if (xch == NULL) + { + fprintf(stderr, "Error opening xc interface. (err: %s)\n", + strerror(errno)); + return errno; + } + + ret = xc_microcode_update(xch, buf, len); + if (ret) + fprintf(stderr, "Failed to update microcode. (err: %s)\n", + strerror(errno)); + + xc_interface_close(xch); + + if (munmap(buf, len)) { + printf("Could not unmap: %d(%s)\n", errno, strerror(errno)); + return errno; + } + close(fd); + + return 0; +} -- 1.8.3.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
WARNING: multiple messages have this Message-ID (diff)
From: Chao Gao <chao.gao@intel.com> To: xen-devel@lists.xenproject.org Cc: Sergey Dyasli <sergey.dyasli@citrix.com>, Ashok Raj <ashok.raj@intel.com>, Wei Liu <wl@xen.org>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Ian Jackson <ian.jackson@eu.citrix.com>, Chao Gao <chao.gao@intel.com> Subject: [Xen-devel] [PATCH v7 01/10] misc/xen-ucode: Upload a microcode blob to the hypervisor Date: Mon, 27 May 2019 16:31:22 +0800 [thread overview] Message-ID: <1558945891-3015-2-git-send-email-chao.gao@intel.com> (raw) Message-ID: <20190527083122.ihBhgJM3tf_G7P1J7FBpIFryyvYRici3jMVXVlNUjmQ@z> (raw) In-Reply-To: <1558945891-3015-1-git-send-email-chao.gao@intel.com> This patch provides a tool for late microcode update. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Chao Gao <chao.gao@intel.com> --- Changes in v7: - introduce xc_microcode_update() rather than xc_platform_op() - avoid creating bounce buffer twice - rename xenmicrocode to xen-ucode, following naming tradition of other tools there. --- tools/libxc/include/xenctrl.h | 1 + tools/libxc/xc_misc.c | 23 +++++++++++++ tools/misc/Makefile | 4 +++ tools/misc/xen-ucode.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 tools/misc/xen-ucode.c diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 538007a..6d80ae5 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1244,6 +1244,7 @@ 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_numainfo(xc_interface *xch, unsigned *max_nodes, xc_meminfo_t *meminfo, uint32_t *distance); int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 5e6714a..85538e0 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -226,6 +226,29 @@ int xc_physinfo(xc_interface *xch, return 0; } +int xc_microcode_update(xc_interface *xch, const void *buf, size_t len) +{ + int ret; + DECLARE_PLATFORM_OP; + DECLARE_HYPERCALL_BUFFER(struct xenpf_microcode_update, uc); + + uc = xc_hypercall_buffer_alloc(xch, uc, len); + if (uc == NULL) + return -1; + + 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); + + ret = do_platform_op(xch, &platform_op); + + xc_hypercall_buffer_free(xch, uc); + + return ret; +} + int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo) { diff --git a/tools/misc/Makefile b/tools/misc/Makefile index d4320dc..63947bf 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -22,6 +22,7 @@ INSTALL_SBIN-$(CONFIG_X86) += xen-hvmcrash INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump +INSTALL_SBIN-$(CONFIG_X86) += xen-ucode INSTALL_SBIN += xencov INSTALL_SBIN += xenlockprof INSTALL_SBIN += xenperf @@ -113,4 +114,7 @@ xen-lowmemd: xen-lowmemd.o xencov: xencov.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xen-ucode: xen-ucode.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + -include $(DEPS_INCLUDE) diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c new file mode 100644 index 0000000..da668ca --- /dev/null +++ b/tools/misc/xen-ucode.c @@ -0,0 +1,78 @@ +#define _GNU_SOURCE + +#include <stdio.h> +#include <stdlib.h> +#include <sys/mman.h> +#include <errno.h> +#include <string.h> +#include <inttypes.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <xenctrl.h> + +void show_help(void) +{ + fprintf(stderr, + "xenmicrocode: Xen microcode updating tool\n" + "Usage: xenmicrocode <microcode blob>\n"); +} + +int main(int argc, char *argv[]) +{ + int fd, len, ret; + char *filename, *buf; + struct stat st; + xc_interface *xch; + + if (argc < 2) + { + show_help(); + return 0; + } + + filename = argv[1]; + fd = open(filename, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "Could not open %s. (err: %s)\n", + filename, strerror(errno)); + return errno; + } + + if (stat(filename, &st) != 0) { + fprintf(stderr, "Could not get the size of %s. (err: %s)\n", + filename, strerror(errno)); + return errno; + } + + len = st.st_size; + buf = mmap(0, len, PROT_READ, MAP_PRIVATE, fd, 0); + if (buf == MAP_FAILED) { + fprintf(stderr, "mmap failed. (error: %s)\n", strerror(errno)); + return errno; + } + + xch = xc_interface_open(0,0,0); + if (xch == NULL) + { + fprintf(stderr, "Error opening xc interface. (err: %s)\n", + strerror(errno)); + return errno; + } + + ret = xc_microcode_update(xch, buf, len); + if (ret) + fprintf(stderr, "Failed to update microcode. (err: %s)\n", + strerror(errno)); + + xc_interface_close(xch); + + if (munmap(buf, len)) { + printf("Could not unmap: %d(%s)\n", errno, strerror(errno)); + return errno; + } + close(fd); + + return 0; +} -- 1.8.3.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-05-27 8:27 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-27 8:31 [PATCH v7 00/10] improve late microcode loading Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-05-27 8:31 ` Chao Gao [this message] 2019-05-27 8:31 ` [Xen-devel] [PATCH v7 01/10] misc/xen-ucode: Upload a microcode blob to the hypervisor Chao Gao 2019-06-04 16:14 ` Andrew Cooper 2019-06-04 16:23 ` Jan Beulich 2019-06-06 2:29 ` Chao Gao 2019-05-27 8:31 ` [PATCH v7 02/10] microcode/intel: extend microcode_update_match() Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-04 14:39 ` Jan Beulich 2019-06-05 13:22 ` Roger Pau Monné 2019-06-05 14:16 ` Jan Beulich 2019-06-06 8:26 ` Chao Gao 2019-06-06 9:01 ` Jan Beulich 2019-05-27 8:31 ` [PATCH v7 03/10] microcode: introduce a global cache of ucode patch Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-04 15:03 ` Jan Beulich 2019-06-10 5:33 ` Chao Gao 2019-06-11 6:50 ` Jan Beulich 2019-05-27 8:31 ` [PATCH v7 04/10] microcode: remove struct ucode_cpu_info Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-04 15:13 ` Jan Beulich 2019-06-10 7:19 ` Chao Gao 2019-05-27 8:31 ` [PATCH v7 05/10] microcode: remove pointless 'cpu' parameter Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-04 15:29 ` Jan Beulich 2019-06-10 7:31 ` Chao Gao 2019-05-27 8:31 ` [PATCH v7 06/10] microcode: split out apply_microcode() from cpu_request_microcode() Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-05 12:37 ` Jan Beulich 2019-06-11 3:32 ` Chao Gao 2019-06-11 7:08 ` Jan Beulich 2019-06-11 8:53 ` Chao Gao 2019-06-11 9:15 ` Jan Beulich 2019-05-27 8:31 ` [PATCH v7 07/10] microcode/intel: Writeback and invalidate caches before updating microcode Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-05 13:20 ` Jan Beulich 2019-05-27 8:31 ` [PATCH v7 08/10] x86/microcode: Synchronize late microcode loading Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-05 14:09 ` Jan Beulich 2019-06-11 12:36 ` Chao Gao 2019-06-11 12:58 ` Jan Beulich 2019-06-11 15:47 ` Raj, Ashok 2019-06-05 14:42 ` Roger Pau Monné 2019-05-27 8:31 ` [PATCH v7 09/10] microcode: remove microcode_update_lock Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-05 14:52 ` Roger Pau Monné 2019-06-05 15:15 ` Jan Beulich 2019-06-05 14:53 ` Jan Beulich 2019-06-11 12:46 ` Chao Gao 2019-06-11 13:23 ` Jan Beulich 2019-06-11 16:04 ` Raj, Ashok 2019-06-12 7:38 ` Jan Beulich 2019-06-13 14:05 ` Chao Gao 2019-06-13 14:08 ` Jan Beulich 2019-06-13 14:58 ` Chao Gao 2019-06-13 17:47 ` Raj, Ashok 2019-06-14 8:58 ` Jan Beulich 2019-05-27 8:31 ` [PATCH v7 10/10] x86/microcode: always collect_cpu_info() during boot Chao Gao 2019-05-27 8:31 ` [Xen-devel] " Chao Gao 2019-06-05 14:56 ` Roger Pau Monné 2019-06-11 13:02 ` Chao Gao 2019-06-05 15:05 ` Jan Beulich 2019-06-11 12:58 ` Chao Gao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1558945891-3015-2-git-send-email-chao.gao@intel.com \ --to=chao.gao@intel.com \ --cc=ashok.raj@intel.com \ --cc=ian.jackson@eu.citrix.com \ --cc=konrad.wilk@oracle.com \ --cc=sergey.dyasli@citrix.com \ --cc=wl@xen.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.