[prev in list] [next in list] [prev in thread] [next in thread]
List: xen-cvs
Subject: [Xen-changelog] [xen master] xen: Introduce a xmemdup_bytes() helper
From: patchbot () xen ! org
Date: 2020-03-29 23:16:05
Message-ID: E1jIh9x-0005AG-Oq () xenbits ! xenproject ! org
[Download RAW message or body]
commit e741f71d1d40f21dacaf32d4272e3e04137129f7
Author: Andrew Cooper <andrew.cooper3@citrix.com>
AuthorDate: Fri Mar 20 20:53:58 2020 +0000
Commit: Andrew Cooper <andrew.cooper3@citrix.com>
CommitDate: Fri Mar 27 12:22:00 2020 +0000
xen: Introduce a xmemdup_bytes() helper
Use it to simplify the x86 microcode logic, taking the opportunity to drop the
-ENOMEM printks.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Wei Liu <wl@xen.org>
Acked-by: Julien Grall <jgrall@amazon.com>
---
xen/arch/x86/cpu/microcode/amd.c | 9 ++-------
xen/arch/x86/cpu/microcode/intel.c | 7 ++-----
xen/include/xen/xmalloc.h | 11 +++++++++++
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c
index 26b4d47567..122b8309af 100644
--- a/xen/arch/x86/cpu/microcode/amd.c
+++ b/xen/arch/x86/cpu/microcode/amd.c
@@ -288,11 +288,10 @@ static int get_ucode_from_buffer_amd(
return -EINVAL;
}
- mc_amd->mpb = xmalloc_bytes(mpbuf->len);
+ mc_amd->mpb = xmemdup_bytes(mpbuf->data, mpbuf->len);
if ( !mc_amd->mpb )
return -ENOMEM;
mc_amd->mpb_size = mpbuf->len;
- memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len);
pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n",
smp_processor_id(), bufsize, mpbuf->len, *offset,
@@ -325,14 +324,10 @@ static int install_equiv_cpu_table(
return -EINVAL;
}
- mc_amd->equiv_cpu_table = xmalloc_bytes(mpbuf->len);
+ mc_amd->equiv_cpu_table = xmemdup_bytes(mpbuf->data, mpbuf->len);
if ( !mc_amd->equiv_cpu_table )
- {
- printk(KERN_ERR "microcode: Cannot allocate memory for equivalent cpu table\n");
return -ENOMEM;
- }
- memcpy(mc_amd->equiv_cpu_table, mpbuf->data, mpbuf->len);
mc_amd->equiv_cpu_table_size = mpbuf->len;
return 0;
diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c
index 653934c183..78455aa0ae 100644
--- a/xen/arch/x86/cpu/microcode/intel.c
+++ b/xen/arch/x86/cpu/microcode/intel.c
@@ -331,13 +331,10 @@ static long get_next_ucode_from_buffer(struct microcode_intel **mc,
return -EINVAL;
}
- *mc = xmalloc_bytes(total_size);
+ *mc = xmemdup_bytes(mc_header, total_size);
if ( *mc == NULL )
- {
- printk(KERN_ERR "microcode: error! Can not allocate memory\n");
return -ENOMEM;
- }
- memcpy(*mc, (const void *)(buf + offset), total_size);
+
return offset + total_size;
}
diff --git a/xen/include/xen/xmalloc.h b/xen/include/xen/xmalloc.h
index f515ceee2a..16979a117c 100644
--- a/xen/include/xen/xmalloc.h
+++ b/xen/include/xen/xmalloc.h
@@ -51,6 +51,17 @@
#define xmalloc_bytes(_bytes) _xmalloc(_bytes, SMP_CACHE_BYTES)
#define xzalloc_bytes(_bytes) _xzalloc(_bytes, SMP_CACHE_BYTES)
+/* Allocate untyped storage and copying an existing instance. */
+#define xmemdup_bytes(_src, _nr) \
+ ({ \
+ unsigned long nr_ = (_nr); \
+ void *dst_ = xmalloc_bytes(nr_); \
+ \
+ if ( dst_ ) \
+ memcpy(dst_, _src, nr_); \
+ dst_; \
+ })
+
/* Free any of the above. */
extern void xfree(void *);
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xenproject.org
https://lists.xenproject.org/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic