diff mbox series

[v7,01/10] misc/xen-ucode: Upload a microcode blob to the hypervisor

Message ID 1558945891-3015-2-git-send-email-chao.gao@intel.com (mailing list archive)
State Superseded
Headers show
Series improve late microcode loading | expand

Commit Message

Chao Gao May 27, 2019, 8:31 a.m. UTC 
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

Comments

Andrew Cooper June 4, 2019, 4:14 p.m. UTC | #1 
On 27/05/2019 09:31, Chao Gao wrote:
> 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)

Xen style.  Extra space please.

> +        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");

s/xenmicrocode/xen-ucode/

Both can be fixed on commit

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Jan Beulich June 4, 2019, 4:23 p.m. UTC | #2 
>>> On 04.06.19 at 18:14, <andrew.cooper3@citrix.com> wrote:
> On 27/05/2019 09:31, Chao Gao wrote:
>> --- /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");
> 
> s/xenmicrocode/xen-ucode/

Isn't it common practice to use argv[0] for such?

Jan
Chao Gao June 6, 2019, 2:29 a.m. UTC | #3 
On Tue, Jun 04, 2019 at 05:14:14PM +0100, Andrew Cooper wrote:
>On 27/05/2019 09:31, Chao Gao wrote:
>> 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)
>
>Xen style.  Extra space please.
>
>> +        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");
>
>s/xenmicrocode/xen-ucode/
>
>Both can be fixed on commit
>
>Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Thanks.

As Jan said, it is better to use argv[0] here.

Chao
diff mbox series

Patch

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;
+}